projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c7677d db4a905)
bitkeeper revision 1.1027 (40e0bbc8sBxtaVRGq2q3E0tn7E4oUg)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 29 Jun 2004 00:46:00 +0000 (00:46 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 29 Jun 2004 00:46:00 +0000 (00:46 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/hp.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
tools/misc/Makefile patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc tools/misc/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.